Update bors configuration #150308
Merged
Update bors configuration #150308
+46
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
Member
|
LGTM. Feel free to r=me. |
18 tasks
rustbot
added
A-CI
Member
Author
|
Added an additional commit, to also enable the |
fmease
reviewed
Dec 23, 2025
| "-S-waiting-on-author", | ||
| "-S-waiting-on-crater", | ||
| "-S-waiting-on-review", | ||
| "-S-waiting-on-team" |
Member
There was a problem hiding this comment.
FYI this flag is deprecated. It's been superseded by S-waiting-on-t-*.
Member
Author
There was a problem hiding this comment.
Right, we could enumerate the labels later, but first I wanted to achieve "feature parity" with homu. This only removes existing labels, so if they are not present, it won't really do anything.
Member
Author
|
@bors r=marcoieni |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 23, 2025
Update bors configuration Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's [configuration file](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L46). This PR also enables reporting of merge conflicts, so that we can test this part of bors on `rust-lang/rust`. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal. r? `@marcoieni`
bors
added a commit
that referenced
this pull request
Dec 23, 2025
Rollup of 5 pull requests Successful merges: - #150182 (Don't export upstream monomorphizations from compiler-builtins) - #150216 (Tidying up tests/ui/issues 15 tests [6/N]) - #150308 (Update bors configuration) - #150311 (Avoid using env::temp when linking a binary) - #150314 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
Dec 24, 2025
Rollup of 6 pull requests Successful merges: - #149800 (Fix ICE in normalization during closure capture analysis (#149746)) - #150182 (Don't export upstream monomorphizations from compiler-builtins) - #150216 (Tidying up tests/ui/issues 15 tests [6/N]) - #150308 (Update bors configuration) - #150314 (rustc-dev-guide subtree update) - #150319 (use new term in description of --target) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Dec 24, 2025
Rollup merge of #150308 - Kobzol:bors-conf, r=marcoieni Update bors configuration Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's [configuration file](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L46). This PR also enables reporting of merge conflicts, so that we can test this part of bors on `rust-lang/rust`. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal. r? ``@marcoieni``
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's configuration file.
This PR also enables reporting of merge conflicts, so that we can test this part of bors on
rust-lang/rust. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal.r? @marcoieni